From 9e4878d281a46408636a9bc4e994cc5c633f7696 Mon Sep 17 00:00:00 2001 From: "cl349@firebug.cl.cam.ac.uk" Date: Mon, 4 Apr 2005 17:14:35 +0000 Subject: [PATCH] bitkeeper revision 1.1236.55.1 (425175fbBCdCc-UwZwZJiL3qUUqQsQ) Fix and use x86_64 config bits. Signed-off-by: Christian Limpach --- linux-2.6.11-xen-sparse/arch/xen/Kconfig | 4 +++ .../arch/xen/x86_64/Kconfig | 25 +++---------------- 2 files changed, 8 insertions(+), 21 deletions(-) diff --git a/linux-2.6.11-xen-sparse/arch/xen/Kconfig b/linux-2.6.11-xen-sparse/arch/xen/Kconfig index 1c2ba9b4a2..1d88c61d13 100644 --- a/linux-2.6.11-xen-sparse/arch/xen/Kconfig +++ b/linux-2.6.11-xen-sparse/arch/xen/Kconfig @@ -153,6 +153,10 @@ if X86 source "arch/xen/i386/Kconfig" endif +if X86_64 +source "arch/xen/x86_64/Kconfig" +endif + menu "Executable file formats" source "fs/Kconfig.binfmt" diff --git a/linux-2.6.11-xen-sparse/arch/xen/x86_64/Kconfig b/linux-2.6.11-xen-sparse/arch/xen/x86_64/Kconfig index 32cee5b84e..0dccbb4412 100644 --- a/linux-2.6.11-xen-sparse/arch/xen/x86_64/Kconfig +++ b/linux-2.6.11-xen-sparse/arch/xen/x86_64/Kconfig @@ -8,31 +8,14 @@ # menu "X86_64 processor configuration" - depends XEN_X86_64 config XENARCH string default x86_64 -config X86_64 - bool - default y - help - Port to the x86-64 architecture. x86-64 is a 64-bit extension to the - classical 32-bit x86 architecture. For details see - . - -config X86 - bool - default y - config 64BIT def_bool y -#config X86 -# bool -# default y - config MMU bool default y @@ -105,10 +88,10 @@ choice prompt "Processor family" default MK8 -config MK8 - bool "AMD-Opteron/Athlon64" - help - Optimize for AMD Opteron/Athlon64/Hammer/K8 CPUs. +#config MK8 +# bool "AMD-Opteron/Athlon64" +# help +# Optimize for AMD Opteron/Athlon64/Hammer/K8 CPUs. config MPSC bool "Intel x86-64" -- 2.30.2